Remove unused patches
authorAnton Gladky <gladk@debian.org>
Wed, 24 Nov 2021 17:02:35 +0000 (18:02 +0100)
committerAnton Gladky <gladk@debian.org>
Wed, 24 Nov 2021 17:02:35 +0000 (18:02 +0100)
debian/patches/70_fix_python_numpy_warning.patch [deleted file]
debian/patches/80_allow_gles_platforms.patch [deleted file]
debian/patches/81_allow_gles_platforms.patch [deleted file]
debian/patches/82_allow_gles_platforms.patch [deleted file]
debian/patches/83_allow_gles_platforms.patch [deleted file]
debian/patches/90_fix_freetype_compilation.patch [deleted file]
debian/patches/91_include_limits.patch [deleted file]
debian/patches/92_proj8.patch [deleted file]
debian/patches/99_fix_ftbfs.patch [new file with mode: 0644]
debian/patches/fix_ftbfs.patch [deleted file]
debian/patches/series

diff --git a/debian/patches/70_fix_python_numpy_warning.patch b/debian/patches/70_fix_python_numpy_warning.patch
deleted file mode 100644 (file)
index 2473932..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Fix python numpy warning
-Author: Anton Gladky <gladk@debian.org>
-Last-Update: 2020-11-09
-
---- vtk9-9.0.1+dfsg1.orig/Wrapping/Python/vtkmodules/numpy_interface/algorithms.py
-+++ vtk9-9.0.1+dfsg1/Wrapping/Python/vtkmodules/numpy_interface/algorithms.py
-@@ -206,7 +206,7 @@ def _global_func(impl, array, axis, cont
-                 return dsa.NoneArray;
-             if res is dsa.NoneArray:
--                if max_dims is 1:
-+                if max_dims == 1:
-                     # Weird trick to make the array look like a scalar
-                     max_dims = ()
-                 res = numpy.empty(max_dims)
diff --git a/debian/patches/80_allow_gles_platforms.patch b/debian/patches/80_allow_gles_platforms.patch
deleted file mode 100644 (file)
index 3160976..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-Description: Allow compilation on GLES platforms
-From a89d6fa9a70054c7bd1718b58996b290ba06ee7f Mon Sep 17 00:00:00 2001
-From: stefan.bruens@rwth-aachen.de
-Date: Tue, 9 Jun 2020 17:34:39 +0200
-Subject: [PATCH] Remove duplicate check for QOpenGLFunctions_3_2_Core*
-
-The return value is already checked in QVTKRenderWindowAdapter::blit(),
-no need to do it twice.
----
- GUISupport/Qt/QVTKOpenGLNativeWidget.cxx | 20 ++++-------
- GUISupport/Qt/QVTKOpenGLWindow.cxx       | 42 ++++++++++--------------
- 2 files changed, 25 insertions(+), 37 deletions(-)
-
-Index: vtk9-9.0.1+dfsg1/GUISupport/Qt/QVTKOpenGLNativeWidget.cxx
-===================================================================
---- vtk9-9.0.1+dfsg1.orig/GUISupport/Qt/QVTKOpenGLNativeWidget.cxx
-+++ vtk9-9.0.1+dfsg1/GUISupport/Qt/QVTKOpenGLNativeWidget.cxx
-@@ -19,7 +19,6 @@
- #include <QOpenGLContext>
- #include <QOpenGLFramebufferObject>
- #include <QOpenGLFunctions>
--#include <QOpenGLFunctions_3_2_Core>
- #include <QOpenGLTexture>
- #include <QPointer>
- #include <QScopedValueRollback>
-@@ -237,14 +236,10 @@ void QVTKOpenGLNativeWidget::paintGL()
-     // before proceeding with blit-ing.
-     this->makeCurrent();
--    QOpenGLFunctions_3_2_Core* f =
--      QOpenGLContext::currentContext()->versionFunctions<QOpenGLFunctions_3_2_Core>();
--    if (f)
--    {
--      const QSize deviceSize = this->size() * this->devicePixelRatioF();
--      this->RenderWindowAdapter->blit(
--        this->defaultFramebufferObject(), GL_COLOR_ATTACHMENT0, QRect(QPoint(0, 0), deviceSize));
--    }
-+    const QSize deviceSize = this->size() * this->devicePixelRatioF();
-+    this->RenderWindowAdapter->blit(
-+      this->defaultFramebufferObject(), GL_COLOR_ATTACHMENT0, QRect(QPoint(0, 0), deviceSize));
-+
-   }
-   else
-   {
-Index: vtk9-9.0.1+dfsg1/GUISupport/Qt/QVTKOpenGLWindow.cxx
-===================================================================
---- vtk9-9.0.1+dfsg1.orig/GUISupport/Qt/QVTKOpenGLWindow.cxx
-+++ vtk9-9.0.1+dfsg1/GUISupport/Qt/QVTKOpenGLWindow.cxx
-@@ -19,7 +19,6 @@
- #include <QOpenGLContext>
- #include <QOpenGLFramebufferObject>
- #include <QOpenGLFunctions>
--#include <QOpenGLFunctions_3_2_Core>
- #include <QOpenGLTexture>
- #include <QPointer>
- #include <QScopedValueRollback>
-@@ -230,25 +229,20 @@ void QVTKOpenGLWindow::paintGL()
-     // before proceeding with blit-ing.
-     this->makeCurrent();
--    QOpenGLFunctions_3_2_Core* f =
--      QOpenGLContext::currentContext()->versionFunctions<QOpenGLFunctions_3_2_Core>();
--    if (f)
-+    const QSize deviceSize = this->size() * this->devicePixelRatioF();
-+    const auto fmt = this->context()->format();
-+    if (fmt.stereo() && this->RenderWindow->GetStereoRender() &&
-+      this->RenderWindow->GetStereoType() == VTK_STEREO_CRYSTAL_EYES)
-     {
--      const QSize deviceSize = this->size() * this->devicePixelRatioF();
--      const auto fmt = this->context()->format();
--      if (fmt.stereo() && this->RenderWindow->GetStereoRender() &&
--        this->RenderWindow->GetStereoType() == VTK_STEREO_CRYSTAL_EYES)
--      {
--        this->RenderWindowAdapter->blitLeftEye(
--          this->defaultFramebufferObject(), GL_BACK_LEFT, QRect(QPoint(0, 0), deviceSize));
--        this->RenderWindowAdapter->blitRightEye(
--          this->defaultFramebufferObject(), GL_BACK_RIGHT, QRect(QPoint(0, 0), deviceSize));
--      }
--      else
--      {
--        this->RenderWindowAdapter->blit(
--          this->defaultFramebufferObject(), GL_BACK, QRect(QPoint(0, 0), deviceSize));
--      }
-+      this->RenderWindowAdapter->blitLeftEye(
-+        this->defaultFramebufferObject(), GL_BACK_LEFT, QRect(QPoint(0, 0), deviceSize));
-+      this->RenderWindowAdapter->blitRightEye(
-+        this->defaultFramebufferObject(), GL_BACK_RIGHT, QRect(QPoint(0, 0), deviceSize));
-+    }
-+    else
-+    {
-+      this->RenderWindowAdapter->blit(
-+        this->defaultFramebufferObject(), GL_BACK, QRect(QPoint(0, 0), deviceSize));
-     }
-   }
-   else
diff --git a/debian/patches/81_allow_gles_platforms.patch b/debian/patches/81_allow_gles_platforms.patch
deleted file mode 100644 (file)
index 938d842..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-From d7fe3fe9df8c26b5a9ea036511cdb1640f5ae2b4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
-Date: Sun, 28 Jun 2020 22:13:32 +0200
-Subject: Replace last glDrawBuffer call with glDrawBuffers(1, ...)
-
-glDrawBuffer is only available in Desktop OpenGL, while the equivalent
-glDrawBuffers is valid also for GLES.
-
-Just defining glDrawBuffer as an empty macro is obviously not the right
-solution, as the call is also required on GLES. This also causes
-a compilation failure - GL.h may be included via GLX.h on X11 platforms,
-and the glDrawBuffer prototype declaration becomes malformed.
----
- Rendering/ContextOpenGL2/vtkOpenGLContextDevice2DPrivate.h | 3 ++-
- ThirdParty/glew/vtk_glew.h.in                              | 1 -
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Rendering/ContextOpenGL2/vtkOpenGLContextDevice2DPrivate.h b/Rendering/ContextOpenGL2/vtkOpenGLContextDevice2DPrivate.h
-index 5632547459..ae3bd53f05 100644
---- a/Rendering/ContextOpenGL2/vtkOpenGLContextDevice2DPrivate.h
-+++ b/Rendering/ContextOpenGL2/vtkOpenGLContextDevice2DPrivate.h
-@@ -324,7 +324,8 @@ public:
-       if (this->SavedDrawBuffer != GL_BACK_LEFT)
-       {
--        glDrawBuffer(this->SavedDrawBuffer);
-+        const GLenum bufs[1] = { static_cast<GLenum>(this->SavedDrawBuffer) };
-+        ::glDrawBuffers(1, bufs);
-       }
-       ostate->vtkglClearColor(this->SavedClearColor[0], this->SavedClearColor[1],
-diff --git a/ThirdParty/glew/vtk_glew.h.in b/ThirdParty/glew/vtk_glew.h.in
-index 6aa8c2ee9e..6afed1d655 100644
---- a/ThirdParty/glew/vtk_glew.h.in
-+++ b/ThirdParty/glew/vtk_glew.h.in
-@@ -52,7 +52,6 @@
- /* some fixes for both ES 2 and 3 */
- #ifdef GL_ES_VERSION_3_0
--#  define glDrawBuffer(arg)
- #  define GL_BACK_LEFT 0
- #  define GL_BACK_RIGHT 0
- #  define GL_FRONT_LEFT 0
--- 
-2.20.1
-
diff --git a/debian/patches/82_allow_gles_platforms.patch b/debian/patches/82_allow_gles_platforms.patch
deleted file mode 100644 (file)
index ee1d4e3..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-From b48706fdff04672bdad6d10afae23afc26b89178 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
-Date: Tue, 9 Jun 2020 17:11:12 +0200
-Subject: Fix compilation when Qt is built for GLES platforms
-
-On GLES 2.0/3.0 platforms (more specifically, for Qt5 "opengl es2" builds),
-QOpenGLFunctions_3_2_Core does not exist.
-
-After the last restructuring, from the GL 3.2 Core functions only
-glDrawBuffer is used. glDrawBuffer can be trivially replaced with
-glDrawBuffers, which is part of OpenGL 2.0 and GLES 3.0, and as an
-extension in many GLES 2.0 implementations.
----
- GUISupport/Qt/QVTKRenderWindowAdapter.cxx | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/GUISupport/Qt/QVTKRenderWindowAdapter.cxx b/GUISupport/Qt/QVTKRenderWindowAdapter.cxx
-index 5a66e236df..530cec9b2a 100644
---- a/GUISupport/Qt/QVTKRenderWindowAdapter.cxx
-+++ b/GUISupport/Qt/QVTKRenderWindowAdapter.cxx
-@@ -28,9 +28,8 @@
- #include <QOffscreenSurface>
- #include <QOpenGLContext>
- #include <QOpenGLDebugLogger>
-+#include <QOpenGLExtraFunctions>
- #include <QOpenGLFramebufferObject>
--#include <QOpenGLFunctions>
--#include <QOpenGLFunctions_3_2_Core>
- #include <QPointer>
- #include <QScopedValueRollback>
- #include <QScreen>
-@@ -334,14 +333,15 @@ public:
-     {
-       return false;
-     }
--    QOpenGLFunctions_3_2_Core* f = this->Context->versionFunctions<QOpenGLFunctions_3_2_Core>();
-+    QOpenGLExtraFunctions* f = this->Context->extraFunctions();
-     if (!f)
-     {
-       return false;
-     }
-     f->glBindFramebuffer(GL_DRAW_FRAMEBUFFER, targetId);
--    f->glDrawBuffer(targetAttachment);
-+    const GLenum bufs[1] = { static_cast<GLenum>(targetAttachment) };
-+    f->glDrawBuffers(1, bufs);
-     f->glBindFramebuffer(GL_READ_FRAMEBUFFER, this->FBO->handle());
-     f->glReadBuffer(
-@@ -436,7 +436,7 @@ public:
-   {
-     Q_ASSERT(this->Context && this->FBO);
--    QOpenGLFunctions_3_2_Core* f = this->Context->versionFunctions<QOpenGLFunctions_3_2_Core>();
-+    QOpenGLFunctions* f = this->Context->functions();
-     if (f)
-     {
-       // now clear alpha otherwise we end up blending the rendering with
--- 
-2.20.1
-
diff --git a/debian/patches/83_allow_gles_platforms.patch b/debian/patches/83_allow_gles_platforms.patch
deleted file mode 100644 (file)
index e08f7a4..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-Subject: HACK: QVTKOpenGLWindow.cxx: Define GL_BACK_{LEFT,RIGHT} for Qt with OpenGL ES
-From: Adrian Bunk <bunk@debian.org>
-
-Date: Fri, 11 Dec 2020 10:42:37 +0200
-
-
----
- GUISupport/Qt/QVTKOpenGLWindow.cxx | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/GUISupport/Qt/QVTKOpenGLWindow.cxx b/GUISupport/Qt/QVTKOpenGLWindow.cxx
-index 3bddc19809..79d5c2b653 100644
---- a/GUISupport/Qt/QVTKOpenGLWindow.cxx
-+++ b/GUISupport/Qt/QVTKOpenGLWindow.cxx
-@@ -35,6 +35,11 @@
- #include "vtkObjectFactory.h"
- #include "vtkOpenGLState.h"
-+#ifndef GL_BACK_LEFT
-+#define GL_BACK_LEFT GL_BACK
-+#define GL_BACK_RIGHT GL_BACK
-+#endif
-+
- QVTKOpenGLWindow::QVTKOpenGLWindow(QOpenGLWindow::UpdateBehavior ub, QWindow* p)
-   : QVTKOpenGLWindow(vtkSmartPointer<vtkGenericOpenGLRenderWindow>::New(), nullptr, ub, p)
- {
--- 
-2.20.1
-
diff --git a/debian/patches/90_fix_freetype_compilation.patch b/debian/patches/90_fix_freetype_compilation.patch
deleted file mode 100644 (file)
index 9c09fb1..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Fix FTBFS against freetype 2.10.4
-Author: mathstuf
-Reviewed-By: Anton Gladky <gladk@debian.org>
-Bug-Debian: https://bugs.debian.org/976975
-Forwarded: https://github.com/Kitware/VTK/commit/3edc0de2b04ae1e100c229e592d6b9fa94f2915a
-Last-Update: 2020-12-10
-
---- vtk9-9.0.1+dfsg1.orig/Rendering/FreeType/vtkFreeTypeTools.cxx
-+++ vtk9-9.0.1+dfsg1/Rendering/FreeType/vtkFreeTypeTools.cxx
-@@ -378,8 +378,7 @@ FTC_CMapCache* vtkFreeTypeTools::GetCMap
- }
- //----------------------------------------------------------------------------
--FT_CALLBACK_DEF(FT_Error)
--vtkFreeTypeToolsFaceRequester(
-+static FT_Error vtkFreeTypeToolsFaceRequester(
-   FTC_FaceID face_id, FT_Library lib, FT_Pointer request_data, FT_Face* face)
- {
- #if VTK_FTFC_DEBUG_CD
diff --git a/debian/patches/91_include_limits.patch b/debian/patches/91_include_limits.patch
deleted file mode 100644 (file)
index 6b103bc..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-From e066c3f4fbbfe7470c6207db0fc3f3952db633cb Mon Sep 17 00:00:00 2001
-From: Mark Olesen <Mark.Olesen@esi-group.com>
-Date: Tue, 9 Feb 2021 15:19:10 +0100
-Subject: [PATCH] COMP: missing includes (clang)
-
----
- Common/Core/vtkGenericDataArrayLookupHelper.h   | 1 +
- Common/DataModel/vtkPiecewiseFunction.cxx       | 1 +
- Filters/HyperTree/vtkHyperTreeGridThreshold.cxx | 1 +
- Rendering/Core/vtkColorTransferFunction.cxx     | 1 +
- 4 files changed, 4 insertions(+)
-
-diff --git a/Common/Core/vtkGenericDataArrayLookupHelper.h b/Common/Core/vtkGenericDataArrayLookupHelper.h
-index ab9d57248f8..202aaa27f4a 100644
---- a/Common/Core/vtkGenericDataArrayLookupHelper.h
-+++ b/Common/Core/vtkGenericDataArrayLookupHelper.h
-@@ -25,6 +25,7 @@
- #include "vtkIdList.h"
- #include <algorithm>
- #include <cmath>
-+#include <limits>
- #include <unordered_map>
- #include <vector>
-diff --git a/Common/DataModel/vtkPiecewiseFunction.cxx b/Common/DataModel/vtkPiecewiseFunction.cxx
-index 22eca0bc22e..11086f1dc42 100644
---- a/Common/DataModel/vtkPiecewiseFunction.cxx
-+++ b/Common/DataModel/vtkPiecewiseFunction.cxx
-@@ -22,6 +22,7 @@
- #include <cassert>
- #include <cmath>
- #include <iterator>
-+#include <limits>
- #include <set>
- #include <vector>
-diff --git a/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx b/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
-index a16bb27fc66..1052192c616 100644
---- a/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
-+++ b/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
-@@ -27,6 +27,7 @@
- #include "vtkHyperTreeGridNonOrientedCursor.h"
- #include <cmath>
-+#include <limits>
- vtkStandardNewMacro(vtkHyperTreeGridThreshold);
-diff --git a/Rendering/Core/vtkColorTransferFunction.cxx b/Rendering/Core/vtkColorTransferFunction.cxx
-index 55c046b4df7..1be02919ab9 100644
---- a/Rendering/Core/vtkColorTransferFunction.cxx
-+++ b/Rendering/Core/vtkColorTransferFunction.cxx
-@@ -21,6 +21,7 @@
- #include <algorithm>
- #include <cmath>
- #include <iterator>
-+#include <limits>
- #include <set>
- #include <vector>
--- 
-GitLab
-
diff --git a/debian/patches/92_proj8.patch b/debian/patches/92_proj8.patch
deleted file mode 100644 (file)
index 5f4f6bb..0000000
+++ /dev/null
@@ -1,149 +0,0 @@
-From 0325638832e35c8c8c6fc96e2c1d887aeea3dd43 Mon Sep 17 00:00:00 2001
-From: Julien Schueller <schueller@phimeca.com>
-Date: Mon, 8 Mar 2021 10:57:46 +0100
-Subject: [PATCH] Geovis: Use proj>=5 api
-
-Closes #18130
----
- Geovis/Core/vtkGeoProjection.cxx    | 17 ++++++++++++++++-
- Geovis/Core/vtkGeoTransform.cxx     | 28 ++++++++++++++--------------
- ThirdParty/libproj/vtk_libproj.h.in |  7 +------
- 3 files changed, 31 insertions(+), 21 deletions(-)
-
-diff --git a/Geovis/Core/vtkGeoProjection.cxx b/Geovis/Core/vtkGeoProjection.cxx
-index 7ff6526a5d3..0a0d06eba19 100644
---- a/Geovis/Core/vtkGeoProjection.cxx
-+++ b/Geovis/Core/vtkGeoProjection.cxx
-@@ -121,7 +121,11 @@ vtkGeoProjection::~vtkGeoProjection()
-   this->SetPROJ4String(nullptr);
-   if (this->Projection)
-   {
-+#if PROJ_VERSION_MAJOR >= 5
-+    proj_destroy(this->Projection);
-+#else
-     pj_free(this->Projection);
-+#endif
-   }
-   delete this->Internals;
-   this->Internals = nullptr;
-@@ -185,13 +189,21 @@ int vtkGeoProjection::UpdateProjection()
-   if (this->Projection)
-   {
-+#if PROJ_VERSION_MAJOR >= 5
-+    proj_destroy(this->Projection);
-+#else
-     pj_free(this->Projection);
-+#endif
-     this->Projection = nullptr;
-   }
-   if (this->PROJ4String && strlen(this->PROJ4String))
-   {
-+#if PROJ_VERSION_MAJOR >= 5
-+    this->Projection = proj_create(PJ_DEFAULT_CTX, this->PROJ4String);
-+#else
-     this->Projection = pj_init_plus(this->PROJ4String);
-+#endif
-   }
-   else
-   {
-@@ -230,8 +242,11 @@ int vtkGeoProjection::UpdateProjection()
-       stringHolder[i] = param.str();
-       pjArgs[3 + i] = stringHolder[i].c_str();
-     }
--
-+#if PROJ_VERSION_MAJOR >= 5
-+    this->Projection = proj_create_argv(PJ_DEFAULT_CTX, argSize, const_cast<char**>(pjArgs));
-+#else
-     this->Projection = pj_init(argSize, const_cast<char**>(pjArgs));
-+#endif
-     delete[] pjArgs;
-   }
-   this->ProjectionMTime = this->GetMTime();
-diff --git a/Geovis/Core/vtkGeoTransform.cxx b/Geovis/Core/vtkGeoTransform.cxx
-index 5c2c74279de..1c99b6b11be 100644
---- a/Geovis/Core/vtkGeoTransform.cxx
-+++ b/Geovis/Core/vtkGeoTransform.cxx
-@@ -163,8 +163,12 @@ void vtkGeoTransform::InternalTransformPoints(double* x, vtkIdType numPts, int s
-   projPJ src = this->SourceProjection ? this->SourceProjection->GetProjection() : nullptr;
-   projPJ dst = this->DestinationProjection ? this->DestinationProjection->GetProjection() : nullptr;
-   int delta = stride - 2;
-+#if PROJ_VERSION_MAJOR >= 5
-+  PJ_COORD c, c_out;
-+#else
-   projLP lp;
-   projXY xy;
-+#endif
-   if (src)
-   {
-     // Convert from src system to lat/long using inverse of src transform
-@@ -172,17 +176,15 @@ void vtkGeoTransform::InternalTransformPoints(double* x, vtkIdType numPts, int s
-     for (vtkIdType i = 0; i < numPts; ++i)
-     {
- #if PROJ_VERSION_MAJOR >= 5
--      xy.x = coord[0];
--      xy.y = coord[1];
-+      c.xy.x = coord[0];
-+      c.xy.y = coord[1];
-+      c_out = proj_trans(src, PJ_INV, c);
-+      coord[0] = c_out.lp.lam;
-+      coord[1] = c_out.lp.phi;
- #else
-       xy.u = coord[0];
-       xy.v = coord[1];
--#endif
-       lp = pj_inv(xy, src);
--#if PROJ_VERSION_MAJOR >= 5
--      coord[0] = lp.lam;
--      coord[1] = lp.phi;
--#else
-       coord[0] = lp.u;
-       coord[1] = lp.v;
- #endif
-@@ -208,17 +210,15 @@ void vtkGeoTransform::InternalTransformPoints(double* x, vtkIdType numPts, int s
-     for (vtkIdType i = 0; i < numPts; ++i)
-     {
- #if PROJ_VERSION_MAJOR >= 5
--      lp.lam = coord[0];
--      lp.phi = coord[1];
-+      c.lp.lam = coord[0];
-+      c.lp.phi = coord[1];
-+      c_out = proj_trans(src, PJ_FWD, c);
-+      coord[0] = c_out.xy.x;
-+      coord[1] = c_out.xy.y;
- #else
-       lp.u = coord[0];
-       lp.v = coord[1];
--#endif
-       xy = pj_fwd(lp, dst);
--#if PROJ_VERSION_MAJOR >= 5
--      coord[0] = xy.x;
--      coord[1] = xy.y;
--#else
-       coord[0] = xy.u;
-       coord[1] = xy.v;
- #endif
-diff --git a/ThirdParty/libproj/vtk_libproj.h.in b/ThirdParty/libproj/vtk_libproj.h.in
-index 4d8ffc3c5d5..c4182c4db2b 100644
---- a/ThirdParty/libproj/vtk_libproj.h.in
-+++ b/ThirdParty/libproj/vtk_libproj.h.in
-@@ -28,14 +28,9 @@
- #if VTK_MODULE_USE_EXTERNAL_vtklibproj
- # if VTK_LibPROJ_MAJOR_VERSION >= 5
- #  include <proj.h>
--# endif
--# if VTK_LibPROJ_MAJOR_VERSION < 6
-+# else
- #  include <projects.h>
- # endif
--# if VTK_LibPROJ_MAJOR_VERSION >= 6
--#  define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H 1
--# endif
--# include <proj_api.h>
- # include <geodesic.h>
- #else
- # include <vtklibproj/src/projects.h>
--- 
-GitLab
-
diff --git a/debian/patches/99_fix_ftbfs.patch b/debian/patches/99_fix_ftbfs.patch
new file mode 100644 (file)
index 0000000..630b3ce
--- /dev/null
@@ -0,0 +1,15 @@
+Description: Fix FTBFS
+Author: Anton Gladky <gladk@debian.org>
+Last-Update: 2021-11-14
+
+--- vtk9-9.1.0+dfsg1.orig/CMake/vtkCompilerExtraFlags.cmake
++++ vtk9-9.1.0+dfsg1/CMake/vtkCompilerExtraFlags.cmake
+@@ -3,7 +3,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+   include(CheckCXXCompilerFlag)
+   # Additional warnings for GCC
+-  set(CMAKE_CXX_FLAGS_WARN "-Wnon-virtual-dtor -Wno-long-long -ansi -Wcast-align -Wchar-subscripts -Wall -Wextra -Wpointer-arith -Wformat-security -Woverloaded-virtual -Wshadow -Wunused-parameter -fno-check-new -fno-common -Werror=undef")
++  set(CMAKE_CXX_FLAGS_WARN "-Wnon-virtual-dtor -Wno-long-long -ansi -Wcast-align -Wchar-subscripts -Wall -Wextra -Wpointer-arith -Wformat-security -Woverloaded-virtual -Wshadow -Wunused-parameter -fno-check-new -fno-common")
+   # This flag is useful as not returning from a non-void function is an error
+   # with MSVC, but it is not supported on all GCC compiler versions
diff --git a/debian/patches/fix_ftbfs.patch b/debian/patches/fix_ftbfs.patch
deleted file mode 100644 (file)
index 630b3ce..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Fix FTBFS
-Author: Anton Gladky <gladk@debian.org>
-Last-Update: 2021-11-14
-
---- vtk9-9.1.0+dfsg1.orig/CMake/vtkCompilerExtraFlags.cmake
-+++ vtk9-9.1.0+dfsg1/CMake/vtkCompilerExtraFlags.cmake
-@@ -3,7 +3,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
-   include(CheckCXXCompilerFlag)
-   # Additional warnings for GCC
--  set(CMAKE_CXX_FLAGS_WARN "-Wnon-virtual-dtor -Wno-long-long -ansi -Wcast-align -Wchar-subscripts -Wall -Wextra -Wpointer-arith -Wformat-security -Woverloaded-virtual -Wshadow -Wunused-parameter -fno-check-new -fno-common -Werror=undef")
-+  set(CMAKE_CXX_FLAGS_WARN "-Wnon-virtual-dtor -Wno-long-long -ansi -Wcast-align -Wchar-subscripts -Wall -Wextra -Wpointer-arith -Wformat-security -Woverloaded-virtual -Wshadow -Wunused-parameter -fno-check-new -fno-common")
-   # This flag is useful as not returning from a non-void function is an error
-   # with MSVC, but it is not supported on all GCC compiler versions
index 174092621fed4969912d06e1993d4c00bc46beca..2a13b5d44b683a9b41ccc401c344534106792385 100644 (file)
@@ -4,14 +4,7 @@
 40_vtkpython-9.patch
 50_fix_python-modules_path.patch
 60_fix_path_perl.patch
-#70_fix_python_numpy_warning.patch
-#80_allow_gles_platforms.patch
-#81_allow_gles_platforms.patch
-#82_allow_gles_platforms.patch
-#83_allow_gles_platforms.patch
-#91_include_limits.patch
-#92_proj8.patch
 95_java_mach-arch_fix.patch
 97_reproducible_builds.patch
 98_fix_mpi4py.py
-fix_ftbfs.patch
+99_fix_ftbfs.patch